(query-replace-map): New keymap.

(perform-replace): Use query-replace-map.
(query-replace, query-replace-regexp, map-query-replace-regexp):
(replace-string, replace-regexp): Don't print `done' if unread chars.

diff --git a/lisp/replace.el b/lisp/replace.el
index 3f730ec3f2fadb5e08cb3d795784efe718940788..3c195224ad93654c51771e70e4c83410d3a67cb5 100644 (file)
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -463,7 +463,7 @@ which will run faster and do exactly what you probably want."
            (replace-match next-replacement nocasify literal)
            (setq replace-count (1+ replace-count)))
        (undo-boundary)
-       (let (done replaced key)
+       (let (done replaced key def)
          ;; Loop reading commands until one of them sets done,
          ;; which means it has finished handling this occurrence.
          (while (not done)